From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 7 Apr 2011 17:13:28 +0000 (+0200)
Subject: NetworkMenu: don't pass NULL to nm_utils_ssid_to_utf8
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8349
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6a27d5ed804c6310478710301a83ec161d25d509;p=gnome-shell.git

NetworkMenu: don't pass NULL to nm_utils_ssid_to_utf8

It expects an Array or a ByteArray, and gjs throws in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=647040
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index a5b8a14c7..48a7a1668 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -101,8 +101,13 @@ NMNetworkMenuItem.prototype = {
         accessPoints = sortAccessPoints(accessPoints);
         this.bestAP = accessPoints[0];
 
-        let ssid = this.bestAP.get_ssid();
-        title = title || NetworkManager.utils_ssid_to_utf8(ssid) || _("<unknown>");
+        if (!title) {
+            let ssid = this.bestAP.get_ssid();
+            if (ssid)
+                title = NetworkManager.utils_ssid_to_utf8(ssid);
+            if (!title)
+                title = _("<unknown>");
+        }
 
         this._label = new St.Label({ text: title });
         this.addActor(this._label);